Fix CME in Client Setup and Incompatibility with Shield Expansion#166
Merged
PssbleTrngle merged 9 commits intoTeamGalena:1.20.xfrom Mar 3, 2026
Merged
Fix CME in Client Setup and Incompatibility with Shield Expansion#166PssbleTrngle merged 9 commits intoTeamGalena:1.20.xfrom
PssbleTrngle merged 9 commits intoTeamGalena:1.20.xfrom
Conversation
evanbones
changed the title
Member
|
Thank you very much, I've finally woken up from hibernation and will check this out |
Member
|
Out of curiosity, what does the new file regarding the texture atlas fix? |
Author
|
Ah whoops, I forgot I had updated some files on this branch. There was an issue where armor trims weren't displaying trim textures (#147), the new atlas files should fix that |
Member
|
interesting thank you, I will also check that out. |
Author
|
That did leak in from the fork yeah, should've been working on a different branch |
PssbleTrngle
approved these changes
Mar 3, 2026
Author
|
Sweet, I'll archive Reoreganized then 👍 |
Member
|
makes sense and thank you very much again for the effort while I was gone ❤️ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
FMLClientSetupEvent runs in parallel and ItemProperties.register and ItemBlockRenderTypes.setRenderLayer aren't thread-safe, causing this semi-infrequent crash:
https://mclo.gs/aCfIKMH
Wrapping these calls in
event.enqueueWork()ensures they run safely on the main threadThe Shield Expansion incompatibility was caused by changes to internals, simply compiling against the latest version of Shield Expansion fixes it.
Closes #172
Might also close #25